bitkeeper revision 1.1236.1.201 (424f003aduMm1rtOkTUks48BFpfFLA)
authorcl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]>
Sat, 2 Apr 2005 20:27:38 +0000 (20:27 +0000)
committercl349@firebug.cl.cam.ac.uk[cl349] <cl349@firebug.cl.cam.ac.uk[cl349]>
Sat, 2 Apr 2005 20:27:38 +0000 (20:27 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean


Trivial merge